Merge "Make action provision protected with extra phone ID" into rvc-qpr-dev