Merge "Change popBackStackImmediate to popBackStack." into ub-calculator-euler