Merge "Hide hiddencat catwatch changes in special changelists"