Merge "Allow for longer strings in priorty onboarding screen" into rvc-dev am: daaa0d74d2 am: fc2d3862c1

Change-Id: I5b7a47e9329685895eb26f8c60d7526ad4e73de5