Merge TWRP changes