Merge "Fix bug: NullPointerException in ChooserActivity" into rvc-qpr-dev