Merge "Adjust lockscreen style to spec" into mnc-dev