Merge with Samsung sources update 10
Dynamic FSync control