Merge "Adjust search bar app icon size/alignment am: 34e2431ebf am: e2871bc784 am: c0e200d5de am: 7a9014461c" into qt-qpr1-dev-plus-aosp