Merge "Fix first-time slice permission grants" into pi-dev