Merge "Lock icon is a set distance from the bottom of display" into sc-dev