Merge "Fix add extra empty screen logic" into sc-dev