Merge "QSTileHost use overrideableByRestore" into rvc-dev