Merge "Revert "Fix the gold highlight encircles the app badge in the bubble."" into rvc-dev