Merge "Fixed failing testAdoptAllShellPermissions test"