Merge "Drop target NPE due to wrong android:theme usage" into ub-launcher3-master