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

Change-Id: I2a0e90dea5926a47338bfc17d2c44ca14fee2938