Merge MIUI upstream changes till 4.11.18