Merge "DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync" into sc-v2-dev