Merge "Fix background cache hint pre-v11" into lmp-mr1-ub-dev