Merge "Fix ordering issue with vibration" into qt-dev