Merge "Replace QSDetail Switch with ViewStub"