Merge "Bring back circle reveal from AOD" into sc-dev