Merge "Fix issue with bubble stack & bubble data expanded bit being out of sync"