Merge "Default ACTIVITY_STARTS_LOGGING_ENABLED flag to 1"