Merge "Revert "Activity start: Send featureId from context->AppOpsManager""