FP2-870: Merge upstream FairphoneLauncher3

- Simplify if statements

Change-Id: I1ba67d4b79b3e2339a5693545da0d2354197e5d1
15 files changed