Merge "Add a way to change the color of the bottom action bar in customtabs" into mnc-ub-dev