Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev
am: a41c75d6d0

Change-Id: I947004db70bb1c7da4e23ac6ce33b2c2214bb4bd