FP2-870: Merge upstream FairphoneLauncher3

- Remove unnecessary commas

Change-Id: Ifa8bb97456ec4638cfa9c41cf77a1b1686d36bde
13 files changed