Merge "Fix scroll issue when going from Display->Ambient Display to Moves." into nyc-mr1-dev