Fixed background UniScrollingManager induced by a refactoring commit
fixed conflicts
fixing conflicts frm merging master into s_p