Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev