Merge "Change launch method for preference Display->Ambient Display." into nyc-mr1-dev