Merge "Grant Shell SETUP_FSVERITY permission" into main