Merge "Re-register SMD after motion detected." into qt-qpr1-dev am: 23e867d5de

Change-Id: I22d0ee2693590a13e99cff140b707c3af0a0aac7