Merge "Reset search button visibility on account change" into ub-gmail-ur14-dev