Merge "Fix action mode animation on recreations am: 45b0ea2a10 am: d5504c365e" into nyc-mr1-dev-plus-aosp