Merge "Lockscreen - AOD layout adjustments"