Minor fixes for slide menu related to rebuild
Fixes for OTA updates
Merge branch 'refs/heads/master' into Peek