Merge "Fix window insets on keyguard" into oc-dr1-dev