Merge "Incorporating theme colors into task views."