Merge "Remove watch overrides on "breakStrategy" for Material TextView."