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

Change-Id: Ia9a373aafa87f11a23a7119c1c46ef2dd306a368