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

Change-Id: Iaf188e009b1b67f7d42c287b408a9c54290bab08