Merge "Fix focused stack adjustment when finishing top activity"