Demo version 1 for new UI
Merge branch 'liuyue' into apseyed-develop
Revert "Merge branch 'liuyue' into apseyed-develop"

This reverts commit 1ea9daae120313ba40c474bd6e472c4e315b04cd, reversing
changes made to ff98413e2426fe6b1bd8e7195a0fafbf59620d4f.