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