Merge "Reinstating the DISABLE_RC_LONG_TERM_MEM macro"