Merge "pm8x41: minor fixes"