[DF-4113] fix for parent color.
Merge branch 'development' into UIKeyboard
[DF-4113] minor refactoring