Merge "Do not launch configuration activity if CONFIGURATION_OPTIONAL." into sc-dev