Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev