Merge "Fix color contrast in search view" into arc-apps