Merge "Remove the dependency on user setting to enable / disable the lockscreen button support" into main