Fix bug preventing users from clicking settings suggestions twice am: f265dbc447 am: e5e60eccaf
am: 5b509e12ff

Change-Id: Iab38544e2e6fa2cb500fbbdc997dacd9dc611198