Merge "Force a full redraw on surface change"