Merge "DO NOT MERGE Disabling BubblesTest for further investigation" into udc-dev