Merge "Don't update lock icon location based on rotation" into sc-dev