Merge "Update restricted setting dialog, unlock toast,  and menu strings" into tm-dev