Fixing dismiss functionality for new checkmatrix system and categories

Change-Id: I3b64c4853587d4d2d8f04fc97c9b3ddb15b520ed
Merge "Fixing dismiss functionality for new checkmatrix system and categories"