Merge "Update the animation when showing / closing inline controls" into nyc-dev