Merge "Overview - leave modal state on orientation changes." into sc-v2-dev