Merge "Increasing string size limit" into ub-launcher3-rvc-dev am: ac9cf47712

Change-Id: Iec63856a68e327e3fad7bd2f45e19c46400a1240