Fix issue where now-hidden phantom messages still broke click intents

Change-Id: If8c27c1cd124d6407bfc406c8bb471af2f1fe02d