Improve 202f172576 according to the review comments
Improve 202f172576 according to the review comments

nemomobile-graveyard/mcompositor,nemomobile-graveyard/mcompositor,nemomobile-graveyard/mcompositor,nemomobile-graveyard/mcompositor,nemomobile-graveyard/mcompositor,nemomobile-graveyard/mcompositor