Merge "remeasure when overlay views change size"