Merge "Animate Night display transition" into nyc-mr1-dev