Merge "Fix notification icon visibility on AOD"