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