Merge "Adjusting top margin on split shade lockscreen according to specs"