Merge "Do not show status bar on first bypass attempt" into qt-qpr1-dev
am: bdab885dba

Change-Id: I5ee771a6a5ecf6cbbad1d1eaed097d5307dcd683