* commit 'fd6b99750bfab7f930ee375a79009874a3196165': Prevent overflow from MeasureSpec.adjust; measure cache fix