Merge "mmc: core: fix issue with HPI polling timeout"