Merge "Fix folder UI open regression when tapping edit text / Fix NPE Bug: 149835166 Bug: 149839789" into ub-launcher3-master