Run animation *after* property sync am: 7c7052dd9b am: 0053b066e5
am: c82ef8a51f

Change-Id: I06962e8d068b3d005b4cd4ce38a4028abab3333b