Merge \"Animate Night display transition\" into nyc-mr1-dev
am: 5c0ea3b5f4

Change-Id: I423226e374fc3aed4d15db6a3b8424597d28794f