FORUM-378 | Incorrect UI and behavior of Watch