Merge "Apps that hold SAW perm on restore get bubble all by default" into rvc-dev