Merge "Partial revert of ag/7508382 to retain back button responsiveness in...
Merge "Partial revert of ag/7508382 to retain back button responsiveness in BiomtericPrompt" into qt-dev am: 4024769f
am: f0089745
Change-Id: Iacc71df6d2243b16c6bf50f7e8f0d248f1da0a97