Merge "Limit existing usages of nav bar button alpha to two button mode" into sc-dev