Merge "Add null check for handler on Clock view" into qt-qpr1-dev