Merge "Rename ACTION_MEMTAG_SETTINGS"