Merge \\"Fix scroll issue when going from Display->Ambient Display to Moves.\\" into nyc-mr1-dev am: 0fd853ad66
am: 83b3647e0c

Change-Id: Ie0c087af1126f000747e78a3e7db09d88793e00b