Merge changes I261ad35f,Id2611b3c into qt-qpr1-dev

* changes:
  Remove assist_gesture_enabled related keys from backup list
  Remove aware sensor related features from backup list