Merge "Fix ScrimView caret alignment and ignore touches" into ub-launcher3-qt-future-dev
am: d69327e9c0

Change-Id: Ia19d766bdeb5d2a4023b1c408bddfe30e4de4dac