I have a 2015 XC60. Recently we noticed that when in gear but not moving the engine starts accelerating to about 1.5K RPMs and drops to 1. This happens continuously. I thought it could be a Mass Air Flow sensor and cleaned it with MAF cleaner, but this continues. One new thing I noticed though, if I change gears to "manual" setting this self acceleration stops.

The following codes have been triggered:
P0507 and P060B (twice, with slight variation)

Not sure if I should clean throttle body or look for something else.