Merge "Fix QS editing from lock screen"