Merge "Fix for CTS testScreenConfiguration" into gingerbread