Merge "Make ActivityStack.mHistory private."