Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Simple Task UI

Change-Id: Ibee30949cf298016fc2757c64534164b416767c4