Merge "Extend character limit" into qt-dev
am: 6ed5fdb062

Change-Id: I53c9de1b83a94bfbe39d8bd8ceeb2a83d0deb4e9