Merge "Tell sublaunched backup settings activities about policy state" into nyc-mr1-dev