Merge "Fix metro clock animation triggers twice when going to AOD" into main