Merge "Add onExpirationUpdate and onKeyStatusChange listeners."