Merge "Tweaks for Policy Control UI"