Preferences: Fix nullPointerException issue
Upstart Script: Fix boot issues on a few devices
Update versions
Merge remote-tracking branch 'origin/3.x' into 3.x