Merge branch 'stable-3.0'

* stable-3.0:
  Simple Task UI

Change-Id: I37a7f4ce1ae6e6c354415b5c206175f37674d6b9