Merge "Enable Ctrl+X cut operations, along with some code refactor."