Merge "Update keyguard clipping" into main