Merge "PIP: Implement focus change animation in PIP control buttons" into nyc-dev