Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev