Merge "Not bypassing when the user is expanding quick settings" into qt-r1-dev