Merge "Rename context names of zram properties"