Merge "Fix bubble theme crash" am: ecd3399053
am: 9beb2d9c4d

Change-Id: If9ba17fa72068064ecba51519d7fd7bdfb81438a