Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev