Merge "Fixing nulpointer exception in AOSP quickstep builds" into ub-launcher3-master