Merge "AOD notification icons placement"