Merge "Clip keyguard root view as the shade expands" into main