Merge pull request #1 from mozilla/master

fork sync
Update MainActivity.java, Issue #352 fix

updateUI() manually sets the button state using setChecked() method
Merge pull request #362 from tamcap/master

Issue #352 fix (on/off button state)