Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev am: 4024769fd1
am: f008974526

Change-Id: Ia618199da848f4c4dbe13af7f51651df84cbf302