Merge "DO NOT MERGE: Update location icon on changes" into rvc-qpr-dev