Merge "Ambient: If user turned off ambient, keep it off after split" into nyc-mr1-dev