Merge "Fixed issue with SCREEN_ORIENTATION_BEHIND not working correctly"