Remove launcher hack

This was an option to restart launcher due to wrong calculations on launcher (hotseat bug)
Remove settings provider entry
Merge remote-tracking branch 'pa/jellybean' into sgs2