Merge "Perform state switch to Overview from -1 screen" into main