Merge "Add control for enable/disable N1_MODE_CAPABILITY" into tm-qpr-dev