Merge "Fixed the issue Label name disappear when user change orientation"