Merge "Decrease line count of AoD notifications"