Merge "Revert "Revert "Remove direct libgui reference from omx server side""" into qt-dev