Merge "Merge "Add communal settings category key." into tm-qpr-dev am: 8118ea49ef am: ac7f50eb5b"