Merge "Focus move to number line when click on name line" am: 003096718f am: 6bd17c5926

Change-Id: I5639c45c1ac5d956804cba2275226b5e73267ec7