Merge "Prevent momentary switch of keyguard to landscape" into jb-mr2-dev