Merge "Set apexd.status to "activated" between activation and DE snapshot." into rvc-dev