Merge "Add flag gate to show only indicator dot" into sc-dev