Merge "Use shared background color animation for settings activity" into tm-dev