Merge "Use same formula to check height and input text size" into rvc-dev am: 17dea3022d

Change-Id: Ie57316e1a22c645a97dbd6b4085035e936c547df