Merge "Fix NPE for Open With ChooserActivity Logging Bug" into rvc-dev