Merge "Hide windows even when AOD is off" into pi-dev