qr screen changes
qr scan activity changes
Merge branch 'develop' into harman25
Merge branch 'develop' into harman25