Merge "Not send switch intents if there is no real intent" into oc-dev