[B2286] Merged code with latest develop branch.
fix for qrcode not holding visible
Merge pull request #413 from loadedcommerce/B2295

B2295