Merge "Controls UI - Up string limit" into rvc-dev am: da984e2b0a

Change-Id: I337ffa2cd4b46f0c58a8308f6db0259994235dce