Merge "Do not launch assistant via long press when device is locked." into cw-f-dev