Merge "Fix: TextView cannot be scrolled."