Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev