Merge "Fix bug #14288652 Settings crash on hitting back key from Tap and Pay screen"