Merge "Revert "mako: disable mdp composition"" into jb-mr1-dev