The variable was being reset to false instead of toggling. Change-Id: Id8ff808e3285af02e5eaa1a09827d3352eb972f8