Merge commit 'b1c9068fa4763547ac35e632077ac40456361065' * commit 'b1c9068fa4763547ac35e632077ac40456361065': Make sure we relayout the TextView when the text changes and marquee is enabled.
Merge commit 'b1c9068fa4763547ac35e632077ac40456361065' * commit 'b1c9068fa4763547ac35e632077ac40456361065': Make sure we relayout the TextView when the text changes and marquee is enabled.