Merge "Convert personal app suspension on COMP->COPE migration" into rvc-dev