Merge "Add temp flag for lockscreen/aod ui prototyping"