Merge "Don't log bad surface size before layout is done."