1. Sync ui code with master
2. Run autopep8
3. Fix few issues

Change-Id: Ic7ebf57b8dc0e3e90f8229e7d5039a3260bd4df5
Merge "1. Sync ui code with master 2. Run autopep8 3. Fix few issues" into R1.10