Merge "[Bug] fix some UI errors. rebase" into 2.0_beta