Merge "Add null check for handler on Clock view" into qt-qpr1-dev am: 410b9a75d2

Change-Id: I5eab49b0e613135762971dba609c17d77d03961d