Merge TWRP changes from omni-44 branch