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

Change-Id: Ie5915412775d0076bdee14e272e2a271cad44daf