Merge "Consolidate ActivityStack#finishCurrentActivityLocked checking"