Merge "FUL uses square aspect ratio for all layouts fixes b/7426399" into jb-mr1-lockscreen-dev