Merge "Remove home snapshot immediately" into rvc-qpr-dev