Merge "Switch LockSettingsStateListener to java interface" into main