Merge "Fixing up search bar and adding bg. (5051804)" into ics-factoryrom