Merge "Overlay swap capability after merge" into lmp-mr1-dev