Merge "Add communal settings category key." into tm-qpr-dev