Merge "Use startActivityAsCaller instead of startActivity." into rvc-dev