Merge "Prefix view ids names to resolve layout overlay issues" into rvc-dev