Merge "Switch the order of lock and home screen tabs in image preview" into ub-launcher3-master