Merge "Smartspace - Allow clicks to avoid intent launch" into sc-v2-dev