Merge "Delay update of all apps' user sensitive state" into rvc-dev