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

* commit '15c8947026ed486ad16ccc1ac43b9d792750b781':

Change-Id: Id8574adc76624aeb95b2814a7f44ab8345fd6a50