Merge "Always consume pending updates before post layout." into mnc-ub-dev