Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as...

Merge "Fix settings page flicker in two ways: 1. On create use UiBlocker as recommended by settings team 2. On resume only update the preferences list if the system setting has    changed." into tm-dev