Merge "Ignore 'wake display' event when AOD is off"