Merge "Do not close QS on security footer dialog"