Merge "Warnings at top of per-app settings page" into tm-dev