Merge "Allowing OOP tests to enable home screen rotation."