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

Change-Id: I358d3544ca50d63a1c7ca4cea1bcc00d5e33512c