Merge "Revert "Move listener to lockscreen setting to application scope"" into main