Merge "The voice assist may now be launched above the lockscreen" into mnc-dev