Merge "Revert to overview coming from the side instead of bottom" into sc-dev