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

Change-Id: I8f1965b69c0ec0963b5a41f9060a145c3e544689