Sync with Glitch_Flo_AOSP