Merge "Add four way directional rotation to WindowOrientationListener"