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

Change-Id: Id7595b63dabd3a6f295a7fadc81bebcbb70a7ea4