Merge "[QR Scanner]: Fix the logic to initialize intent with default activity" into udc-qpr-dev