Merge "Prevent dream service finishSelf before it was attached" into rvc-dev