Merge "Always use the locked input consumer when showing activity over lockscreen" into ub-launcher3-qt-dev am: dfbb964dcc
am: 3271616ce9

Change-Id: Ia23148377374fcc2d655a7e4d0259e9db195dc50