Merge "Rename getTopActivity to getTopNonFinishingActivity (69/n)"