Merge "Fix Multi user avater View overlap privacy dot" into sc-dev