Merge "Instrument CUJ for HUN and App launch from notification"