Merge "Don't suspend personal SMS app" into rvc-dev