Merge tag 'backport/v4.1/mach-shmobile-to-v4.3' into backport/v4.1.12/snapshot