Merge "Fixes typo in Wear window animation." into nyc-dev