Merge "[People Service] Re-order clean-up to only occur once per shortcuts update" into tm-qpr-dev