Merge "Refreshing visibility of QS elements whenever configuration changes" into sc-v2-dev