Better handling of settings for charts

Change-Id: I6cbe04abb1d498a5222510aeb57038e4814a3e2d
Merge "Better handling of settings for charts"