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

Change-Id: I9f8db741a1141439f06831248b3bd260f2532a3f