Merge "Don't allow activites on virtual displays" into rvc-dev