Merge "Only keep methods with correct signature for view/menu click"