[automerger skipped] Merge "Add null check for handler on Clock view" into qt-qpr1-dev am: 410b9a75d2 am: b1470396d4 -s ours
am skip reason: Change-Id Ie8a2627004876cf35291d52bd3686a5014498f52 with SHA-1 87b90fe160 is in history

Change-Id: I43b1d5b154b95f1c3e8dec27df78860a6d5caa72