re-arrange wait, assert check in test_settings_wallpaper.py
Merge pull request #813 from AaronMT/811

Re-arrange wait, assert check in test_settings_wallpaper.py