Merge "Controls in Lockscreen Dialog" into sc-dev