Merge "AOD - Notif icon location" into sc-v2-dev