Merge "Revert "Unrestrict updated buggy apps."" into rvc-dev