Merge "Re-add checks for mutable intents on bubbles" into sc-dev