Merge "Remove the xml for bubble pref in developer options" into rvc-dev