Merge "Removing all traces of Market button and TabIndicator" into ub-now-queens