Merge "Add ANGLE_ENABLED_APP to CoreSettings"