Optimization patches from CAF for zram