Merge "Prevent QS expansion while remote input active" into sc-dev