Merge "Hide windows even when AOD is off" into pi-dev
am: 5c75b5b60e

Change-Id: If72e024f9d3d31ef774588b5cac5f1b553608717