Merge "Updated support for animator in MediaNowPlayingView pre-Lollipop" into nyc-mr1-dev