merge "recovery: Don't enable UMS function unless needed"
Do not compile!