ConfigPP cleanup
Avoid failed SB updating in SourceUpdateManager for window system v2
SCC Fixes