Merge "Remove lockscreen lwp flag" into main