Merge "Remove duplicate search result when search "Bubbles"" into rvc-dev am: 86b5034215 am: 5aa9c97a51

Change-Id: Id445a10fc9a77b0cdf46289e7fbbf438a6497ad1