Merge "Disable back button on crypto screen" into mnc-dev