Merge "Remove assist_gesture_enabled related keys from backup list"