Merge "Fix dismiss ciricle being behind expanded view" into sc-dev