Merge "Slighly improve the API to discover if the OMX stack is running in the local"