Sync with Glitch_Flo_AOSP up to 63873de2fc