Merge "Have the final setVisibility cause a requestLayout." into mnc-dev