Also avoid jumping of the frame width when changing between the editable version and the hover version. Change-Id: I9a26b99f8ee442536b9dbc4423202d51a152cc22