Consolidate Recovery settings and add QCOM bits