Merge MIUI changes and unify phone/tablet