Merge "Refactor LockScreenLockIconController" into sc-dev