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

Change-Id: I5f402661ebd999f7b48d6750d9d641e5b9cec6e4