Merge "Fix 2428368: Fix most of the lockscreen orientation refresh bugs"