Merge "Remove lockscreen lwp flag: followup" into main