Merge "Rename CalculatorActivity back to Calculator"