Merge "Fixed the issue Label name disappear when user change orientation"
am: 5174049e63

Change-Id: Ie3d85f8328c0a1167c9a7314423891b37c574df9