Merge "FP2-1996: FairphoneLauncher3: Integrate latest AOSP fixes and improvements" into fp/fp2_5.1_int