Merge "Controls - Remove controls from lockscreen, use wallet" into sc-dev