Merge "Fixed an issue when updating media actions"