Merge "Make sure that FAB's border respects tint updates" into mnc-ub-dev