Merge "Add ACCESS_PDB_STATE to shell permissions" into tm-dev