Merge "Moving the setContentView at the end of onCreate" into ub-launcher3-master