Merge "Enabling assistant and accessibility gesture while lock screen is showing" into ub-launcher3-qt-dev
am: 33a2946b7f

Change-Id: I9600082875f27040bcf056ddf1b3db76ce68ae30