Merge "Prevent improper requestLayout calls from lockscreen changing y position" into main