preserve selection if chart creation is cancelled, cp#1000052

Change-Id: Ia8edb3e4c55e1a52515a761a60c4b1a59c990e1c