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

Change-Id: I442792c44fa57d8b2ee87958d51b7ebbac5f91a5