Merge "Fix gesture exclusion for bubbles" into sc-dev