Merge "Default to the new lockscreen layout for AOSP" into sc-dev