Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev