Merge "AOD icons should initially be invisible" into sc-dev