Merge "AOD: Fix fallout from new Ambient Display"