Merge "Merge "Invalidate anchor info only after a full layout" into nyc-dev am: fe17b0c5d2 am: e40d25178e" into nyc-mr1-dev-plus-aosp