Merge "Simple Task UI" into stable-2.16