Merge pull request #1788 from jlipps/master

make toggle test ready for appium test
add tests for --force-iphone and --force-ipad