Merge "Adding enabled state for remote actions."