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

Change-Id: I92f1fe1dfc456949501e4653d5d5c727e0161f5c