Merge "Changing minSDK for launcher3 to 21 (Lollipop)" into ub-launcher3-calgary