Merge "Fix window insets on keyguard" into oc-dr1-dev
am: 6462fe4b95

Change-Id: I26e59cb96c0560334dcb7501d9e13ec38dc8c9ba