Merge "Hide windows even when AOD is off"