testmerged_prs from 230690 on Terry
Activate Windows Go to Settings to activate Windows