Merge "Fix unsuspending personal apps." into rvc-dev