Merge "Make RescueParty call vold directly" into qt-dev