Some changes for tablet height scaling

Change-Id: Ib9dc1edc1af26654bb79897748b31f13bde3944d