Merge "Fix invalidateOutline" into lmp-mr1-dev