Merge "Do not let snapshot window control the bar" into sc-v2-dev