FP2-870: Merge upstream FairphoneLauncher3

- Fix numeric issues

Change-Id: I15dc384d8d4eeeb76a2006ae652cce94cb4c474e
5 files changed