Merge "Fix 3329600: Always enable screen rotation in lockscreen." into honeycomb