Merge "Handle navigation back problem from About Phone"