Merge "Settings panel is expanded correnctly when QQS is showing"