Merge "Separate ambient display triggers" into nyc-mr1-dev