Merge "TEMP: Repair user sensitive read phone flags" into rvc-dev