Merge "Adjust search bar app icon size/alignment am: 34e2431ebf am: e2871bc784 am: f338542885" into qt-r1-dev-plus-aosp