Merge "Controls on lockscreen" into sc-dev