Merge changes from topics "search_ripple_clipping", "search_text_overlap" into pi-car-dev am: 9f65343a05 am: 0ef5b07ab2
am: 2d29978062

Change-Id: I24b6583d9403d0e86fe1c6fe1d01a0cf765fd8de