Merge "Sanitizing various search container ids and layout names" into ub-launcher3-dorval-polish
am: efbfcb838d

Change-Id: Id66c371061d3cca6f9c0c09684e12ff7b5f33c32