Merge "Updated support for animator in MediaNowPlayingView pre-Lollipop"