Merge "Update Screen Configuration Tests" into gingerbread