Merge "Do not stop dream service if dream activity is relaunching" into rvc-dev