Merge "Fix bubble theme crash"
am: ecd3399053

Change-Id: Ife0dcac7f2f72a106f80e73678848f448918b62f