Merge "[pm] make sure to restore mAlways=true preferred activity filter" into rvc-dev