Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev