Merge "RESTRICT AUTOMERGE Fix the bootloop happening due to missing permission." into sc-v2-dev