Switch to onchange to watch
Re-add Android to SL platforms